From 37c34369064026b5bc34e9e222580c1bef7c8b44 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 6 Jul 2020 14:02:54 +0100 Subject: [PATCH] Cherry-pick a patch from 3.98.5 to fix the build --- debian/changelog | 2 ++ debian/patches/series | 1 + ...suite-Remove-obsolete-test-from-list.patch | 25 +++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 debian/patches/series create mode 100644 debian/patches/testsuite-Remove-obsolete-test-from-list.patch diff --git a/debian/changelog b/debian/changelog index cdc10d046f..d3e9cea01e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ gtk+4.0 (3.98.4-1) UNRELEASED; urgency=medium to `ninja test` and are now for `meson test`. * Depend on fonts-cantarell for tests * Run build-time tests with a D-Bus session bus via dbus-run-session + * d/p/testsuite-Remove-obsolete-test-from-list.patch: + Cherry-pick a patch from 3.98.5 to fix the build -- Simon McVittie Mon, 06 Jul 2020 10:47:20 +0100 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000000..8b5f064ce0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +testsuite-Remove-obsolete-test-from-list.patch diff --git a/debian/patches/testsuite-Remove-obsolete-test-from-list.patch b/debian/patches/testsuite-Remove-obsolete-test-from-list.patch new file mode 100644 index 0000000000..fac821d921 --- /dev/null +++ b/debian/patches/testsuite-Remove-obsolete-test-from-list.patch @@ -0,0 +1,25 @@ +From: Matthias Clasen +Date: Mon, 18 May 2020 21:49:34 -0400 +Subject: testsuite: Remove obsolete test from list + +The test was removed in 97d0e8c6e07c08ae, but I neglected +to remove the test files from meson.build. + +Fixes: #2760 +Origin: upstream, 3.98.5, commit:17dd32da883bb7cb67263d936b4d128be8b6be34 +--- + testsuite/css/change/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/testsuite/css/change/meson.build b/testsuite/css/change/meson.build +index 9de4349..04204ed 100644 +--- a/testsuite/css/change/meson.build ++++ b/testsuite/css/change/meson.build +@@ -23,7 +23,6 @@ test_data = [ + 'test2.css', 'test2.ui', 'test2.nodes', + 'test3.css', 'test3.ui', 'test3.nodes', + 'test4.css', 'test4.ui', 'test4.nodes', +- 'test5.css', 'test5.ui', 'test5.nodes', + ] + + if get_option('install-tests') -- 2.30.2